* xterm.c (XTread_socket): Turn off ControlMask for XLookupString.

	* keyboard.c (make_lispy_event): Controlify here.

diff --git a/src/xterm.c b/src/xterm.c
index 50927c926634d30d9bc81429b7fc7c54956cabee..66251846cb99598f8e58ebf77e1770ecbbd904fe 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2829,6 +2829,10 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
              modifiers = event.xkey.state;
 
              /* This will have to go some day...  */
+
+             /* make_lispy_event turns chars into control chars.
+                Don't do it here because XLookupString is too eager.  */
+             event.xkey.state &= ~ControlMask;
              nbytes =
                XLookupString (&event.xkey, copy_buffer, 80, &keysym,
                               &compose_status);